From a88bb55abf3ec907e64353f34c161d4fa829098ef478ff298bc1d920a93312a2 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Fri, 21 Nov 2008 14:38:05 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/net-snmp?expand=0&rev=17 --- ...snmp-5.4.1.2-etherlike-mib-revised_2.patch | 34 ++++++++----------- net-snmp.changes | 14 ++++++++ net-snmp.spec | 13 +++++-- 3 files changed, 39 insertions(+), 22 deletions(-) rename net-snmp-5.4.1.2-etherlike-mib-revised_1.patch => net-snmp-5.4.1.2-etherlike-mib-revised_2.patch (99%) diff --git a/net-snmp-5.4.1.2-etherlike-mib-revised_1.patch b/net-snmp-5.4.1.2-etherlike-mib-revised_2.patch similarity index 99% rename from net-snmp-5.4.1.2-etherlike-mib-revised_1.patch rename to net-snmp-5.4.1.2-etherlike-mib-revised_2.patch index d2826fc..383b264 100644 --- a/net-snmp-5.4.1.2-etherlike-mib-revised_1.patch +++ b/net-snmp-5.4.1.2-etherlike-mib-revised_2.patch @@ -1,7 +1,7 @@ Index: agent/mibgroup/etherlike-mib/dot3StatsTable.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ agent/mibgroup/etherlike-mib/dot3StatsTable.c 2008-09-16 16:36:36.675793898 +0200 ++++ agent/mibgroup/etherlike-mib/dot3StatsTable.c 2008-11-21 14:49:15.697017950 +0100 @@ -0,0 +1,212 @@ +/* + * Note: this file originally auto-generated by mib2c using @@ -218,8 +218,8 @@ Index: agent/mibgroup/etherlike-mib/dot3StatsTable.c Index: agent/mibgroup/etherlike-mib/dot3StatsTable_data_access.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ agent/mibgroup/etherlike-mib/dot3StatsTable_data_access.c 2008-09-16 16:36:36.687791867 +0200 -@@ -0,0 +1,797 @@ ++++ agent/mibgroup/etherlike-mib/dot3StatsTable_data_access.c 2008-11-21 14:49:15.713015508 +0100 +@@ -0,0 +1,793 @@ +/* + * Note: this file originally auto-generated by mib2c using + * version : 14170 $ of $ @@ -735,8 +735,6 @@ Index: agent/mibgroup/etherlike-mib/dot3StatsTable_data_access.c + if (err < 0) { + DEBUGMSGTL(("access:dot3StatsTable:interface_ioctl_dot3Stats_get", + "ETHTOOL_GETDRVINFO failed for interface |%s| \n", name)); -+ snmp_log (LOG_ERR, "access:dot3StatsTable,interface_ioctl_dot3Stats_get, ETHTOOL_GETDRVINFO failed for interface |%s| \n", name); -+ + return -1; + } + @@ -950,8 +948,6 @@ Index: agent/mibgroup/etherlike-mib/dot3StatsTable_data_access.c + if (rc < 0) { + DEBUGMSGTL(("access:dot3StatsTable:ioctl", + "dot3Stats_ioctl_get ioctl %d returned %d\n", which, rc)); -+ snmp_log (LOG_ERR, "access:dot3StatsTable:ioctl, _dot3Stats_ioctl_get error on interface '%s'\n", name); -+ + rc = -3; + } + @@ -1020,7 +1016,7 @@ Index: agent/mibgroup/etherlike-mib/dot3StatsTable_data_access.c Index: agent/mibgroup/etherlike-mib/dot3StatsTable_data_access.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ agent/mibgroup/etherlike-mib/dot3StatsTable_data_access.h 2008-09-16 16:36:36.723791619 +0200 ++++ agent/mibgroup/etherlike-mib/dot3StatsTable_data_access.h 2008-11-21 14:49:15.729015387 +0100 @@ -0,0 +1,74 @@ +/* + * Note: this file originally auto-generated by mib2c using @@ -1099,7 +1095,7 @@ Index: agent/mibgroup/etherlike-mib/dot3StatsTable_data_access.h Index: agent/mibgroup/etherlike-mib/dot3StatsTable_data_get.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ agent/mibgroup/etherlike-mib/dot3StatsTable_data_get.c 2008-09-16 16:36:36.771791634 +0200 ++++ agent/mibgroup/etherlike-mib/dot3StatsTable_data_get.c 2008-11-21 14:49:15.746371333 +0100 @@ -0,0 +1,1450 @@ +/* + * Note: this file originally auto-generated by mib2c using @@ -2554,7 +2550,7 @@ Index: agent/mibgroup/etherlike-mib/dot3StatsTable_data_get.c Index: agent/mibgroup/etherlike-mib/dot3StatsTable_data_get.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ agent/mibgroup/etherlike-mib/dot3StatsTable_data_get.h 2008-09-16 16:36:37.036291779 +0200 ++++ agent/mibgroup/etherlike-mib/dot3StatsTable_data_get.h 2008-11-21 14:49:15.812233418 +0100 @@ -0,0 +1,143 @@ +/* + * Note: this file originally auto-generated by mib2c using @@ -2702,7 +2698,7 @@ Index: agent/mibgroup/etherlike-mib/dot3StatsTable_data_get.h Index: agent/mibgroup/etherlike-mib/dot3StatsTable_data_set.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ agent/mibgroup/etherlike-mib/dot3StatsTable_data_set.c 2008-09-16 16:36:37.492292427 +0200 ++++ agent/mibgroup/etherlike-mib/dot3StatsTable_data_set.c 2008-11-21 14:49:15.821015201 +0100 @@ -0,0 +1,28 @@ +/* + * Note: this file originally auto-generated by mib2c using @@ -2735,7 +2731,7 @@ Index: agent/mibgroup/etherlike-mib/dot3StatsTable_data_set.c Index: agent/mibgroup/etherlike-mib/dot3StatsTable_data_set.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ agent/mibgroup/etherlike-mib/dot3StatsTable_data_set.h 2008-09-16 16:36:38.151791028 +0200 ++++ agent/mibgroup/etherlike-mib/dot3StatsTable_data_set.h 2008-11-21 14:49:15.837015420 +0100 @@ -0,0 +1,28 @@ +/* + * Note: this file originally auto-generated by mib2c using @@ -2768,7 +2764,7 @@ Index: agent/mibgroup/etherlike-mib/dot3StatsTable_data_set.h Index: agent/mibgroup/etherlike-mib/dot3StatsTable_enums.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ agent/mibgroup/etherlike-mib/dot3StatsTable_enums.h 2008-09-16 16:36:38.676291554 +0200 ++++ agent/mibgroup/etherlike-mib/dot3StatsTable_enums.h 2008-11-21 14:49:15.854950134 +0100 @@ -0,0 +1,89 @@ +/* + * Note: this file originally auto-generated by mib2c using @@ -2862,7 +2858,7 @@ Index: agent/mibgroup/etherlike-mib/dot3StatsTable_enums.h Index: agent/mibgroup/etherlike-mib/dot3StatsTable.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ agent/mibgroup/etherlike-mib/dot3StatsTable.h 2008-09-16 16:36:39.608291709 +0200 ++++ agent/mibgroup/etherlike-mib/dot3StatsTable.h 2008-11-21 14:49:15.871679425 +0100 @@ -0,0 +1,271 @@ +/* + * Note: this file originally auto-generated by mib2c using @@ -3138,7 +3134,7 @@ Index: agent/mibgroup/etherlike-mib/dot3StatsTable.h Index: agent/mibgroup/etherlike-mib/dot3StatsTable_interface.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ agent/mibgroup/etherlike-mib/dot3StatsTable_interface.c 2008-09-16 16:36:40.483792165 +0200 ++++ agent/mibgroup/etherlike-mib/dot3StatsTable_interface.c 2008-11-21 14:49:15.889030395 +0100 @@ -0,0 +1,1188 @@ +/* + * Note: this file originally auto-generated by mib2c using @@ -4331,7 +4327,7 @@ Index: agent/mibgroup/etherlike-mib/dot3StatsTable_interface.c Index: agent/mibgroup/etherlike-mib/dot3StatsTable_interface.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ agent/mibgroup/etherlike-mib/dot3StatsTable_interface.h 2008-09-16 16:36:40.923791934 +0200 ++++ agent/mibgroup/etherlike-mib/dot3StatsTable_interface.h 2008-11-21 14:49:15.930132856 +0100 @@ -0,0 +1,94 @@ +/* + * Note: this file originally auto-generated by mib2c using @@ -4430,7 +4426,7 @@ Index: agent/mibgroup/etherlike-mib/dot3StatsTable_interface.h Index: agent/mibgroup/etherlike-mib/dot3StatsTable_oids.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ agent/mibgroup/etherlike-mib/dot3StatsTable_oids.h 2008-09-16 16:36:41.147792362 +0200 ++++ agent/mibgroup/etherlike-mib/dot3StatsTable_oids.h 2008-11-21 14:49:15.946860586 +0100 @@ -0,0 +1,82 @@ +/* + * Note: this file originally auto-generated by mib2c using @@ -4517,7 +4513,7 @@ Index: agent/mibgroup/etherlike-mib/dot3StatsTable_oids.h Index: agent/mibgroup/etherlike-mib/ioctl_imp_common.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ agent/mibgroup/etherlike-mib/ioctl_imp_common.h 2008-09-16 16:36:41.212292001 +0200 ++++ agent/mibgroup/etherlike-mib/ioctl_imp_common.h 2008-11-21 14:49:15.963587994 +0100 @@ -0,0 +1,71 @@ +#include +#include @@ -4593,7 +4589,7 @@ Index: agent/mibgroup/etherlike-mib/ioctl_imp_common.h Index: agent/mibgroup/etherlike-mib.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ agent/mibgroup/etherlike-mib.h 2008-09-16 16:36:41.247791806 +0200 ++++ agent/mibgroup/etherlike-mib.h 2008-11-21 14:50:28.965015841 +0100 @@ -0,0 +1,10 @@ +/* + * module to include the modules diff --git a/net-snmp.changes b/net-snmp.changes index 5d76468..7285ef3 100644 --- a/net-snmp.changes +++ b/net-snmp.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Fri Nov 21 14:53:28 CET 2008 - mrueckert@suse.de + +- update patches from Dell: + Upstream asked to reduce the logging in the mib module. + old name net-snmp-5.4.1.2-etherlike-mib-revised_1.patch + new name net-snmp-5.4.1.2-etherlike-mib-revised_2.patch + +------------------------------------------------------------------- +Thu Nov 20 17:33:25 CET 2008 - mrueckert@suse.de + +- Remove the recommends on perl-Tk again. We rely on the fixed + warning in the perl_tk_warnings.patch. (bnc#443047) + ------------------------------------------------------------------- Tue Nov 11 16:54:26 CET 2008 - ro@suse.de diff --git a/net-snmp.spec b/net-snmp.spec index 6a4f91b..06d301a 100644 --- a/net-snmp.spec +++ b/net-snmp.spec @@ -20,7 +20,7 @@ Name: net-snmp Version: 5.4.2.1 -Release: 3 +Release: 4 # License: BSD 3-Clause; X11/MIT Group: Productivity/Networking/Other @@ -80,7 +80,7 @@ Patch8: net-snmp-5.4.2_net-snmp-config_headercheck.patch Patch9: net-snmp-5.4.2_perl_tk_warning.patch Patch10: net-snmp-5.4.2_snmpconf-selinux.patch Patch11: net-snmp-5.3.0.1_trap-agent-addr_v2.patch -Patch12: net-snmp-5.4.1.2-etherlike-mib-revised_1.patch +Patch12: net-snmp-5.4.1.2-etherlike-mib-revised_2.patch Patch13: net-snmp-5.4.1.2-rmon-mib-revised.patch Patch14: net-snmp-5.4.2_velocity-mib.patch Patch15: Fix-for-tcpConnnectionTable-tcpListenerTable-udpEn.patch @@ -194,7 +194,6 @@ Authors: License: GPL v2 or later Group: Development/Libraries/Perl Requires: %{pkg_name} = %{version} -Recommends: perl-Tk %perl_requires # Summary: Perl-SNMP @@ -438,6 +437,14 @@ fi %{_bindir}/tkmib %changelog +* Fri Nov 21 2008 mrueckert@suse.de +- update patches from Dell: + Upstream asked to reduce the logging in the mib module. + old name net-snmp-5.4.1.2-etherlike-mib-revised_1.patch + new name net-snmp-5.4.1.2-etherlike-mib-revised_2.patch +* Thu Nov 20 2008 mrueckert@suse.de +- Remove the recommends on perl-Tk again. We rely on the fixed + warning in the perl_tk_warnings.patch. (bnc#443047) * Tue Nov 11 2008 ro@suse.de - SLE-11 uses PPC64 instead of PPC, adapt baselibs.conf * Mon Nov 10 2008 mrueckert@suse.de