Hello community, here is the log from the commit of package perl-Net-SNMP for openSUSE:Factory checked in at Sat Nov 20 12:22:05 CET 2010. -------- --- perl-Net-SNMP/perl-Net-SNMP.changes 2010-07-27 15:08:06.000000000 +0200 +++ /mounts/work_src_done/STABLE/perl-Net-SNMP/perl-Net-SNMP.changes 2010-11-19 12:39:56.000000000 +0100 @@ -1,0 +2,13 @@ +Fri Nov 19 11:09:45 UTC 2010 - lars@linux-schulserver.de + +- update to v6.0.1 + + Removed all occurrences of the "locked" attribute that was + deprecated in Perl 5.12.0. + + Changed the test validating the presence of a monotonic time value + to check for invalid implementations. + + The SNMPv3 contextEngineID and contextName are now stored as part + of the request allowing for these values to be changed between + messages. +- also package the examples + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- Net-SNMP-v6.0.0.tar.bz2 New: ---- Net-SNMP-v6.0.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Net-SNMP.spec ++++++ --- /var/tmp/diff_new_pack.J0oqpZ/_old 2010-11-20 12:21:27.000000000 +0100 +++ /var/tmp/diff_new_pack.J0oqpZ/_new 2010-11-20 12:21:27.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package perl-Net-SNMP (Version 6.0.0) +# spec file for package perl-Net-SNMP (Version 6.0.1) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -21,7 +21,7 @@ Name: perl-Net-SNMP %define cpan_name Net-SNMP Summary: Object oriented interface to SNMP -Version: 6.0.0 +Version: 6.0.1 Release: 1 License: GPL+ or Artistic Group: Development/Libraries/Perl @@ -88,6 +88,6 @@ %files -f %{name}.files %defattr(-,root,root,-) -%doc Changes LICENSE README +%doc Changes LICENSE README examples %changelog ++++++ Net-SNMP-v6.0.0.tar.bz2 -> Net-SNMP-v6.0.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Net-SNMP-v6.0.0/Changes new/Net-SNMP-v6.0.1/Changes --- old/Net-SNMP-v6.0.0/Changes 2009-09-09 17:13:02.000000000 +0200 +++ new/Net-SNMP-v6.0.1/Changes 2010-09-10 02:02:45.000000000 +0200 @@ -1,5 +1,16 @@ Net::SNMP Changes +RELEASE 6.0.1 SEP-09-2010 + +- Removed all occurrences of the "locked" attribute that was + deprecated in Perl 5.12.0. +- Changed the test validating the presence of a monotonic time value + to check for invalid implementations. +- The SNMPv3 contextEngineID and contextName are now stored as part + of the request allowing for these values to be changed between + messages. + + RELEASE 6.0.0 SEP-09-2009 - Substantial internal code cleanup was performed based upon the @@ -316,4 +327,4 @@ RCS - $Id: Changes,v 6.0 2009/09/09 15:05:32 dtown Rel $ + $Id: Changes,v 6.1 2010/09/10 00:01:22 dtown Rel $ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Net-SNMP-v6.0.0/LICENSE new/Net-SNMP-v6.0.1/LICENSE --- old/Net-SNMP-v6.0.0/LICENSE 2009-09-09 17:13:02.000000000 +0200 +++ new/Net-SNMP-v6.0.1/LICENSE 2010-09-10 02:02:45.000000000 +0200 @@ -1,4 +1,4 @@ -This software is copyright (c) 2009 by David M. Town <dtown@cpan.org>. +This software is copyright (c) 2010 by David M. Town <dtown@cpan.org>. This is free software; you can redistribute it and/or modify it under the same terms as the Perl 5 programming language system itself. @@ -12,7 +12,7 @@ --- The GNU General Public License, Version 1, February 1989 --- -This software is Copyright (c) 2009 by David M. Town <dtown@cpan.org>. +This software is Copyright (c) 2010 by David M. Town <dtown@cpan.org>. This is free software, licensed under: @@ -270,7 +270,7 @@ --- The Artistic License 1.0 --- -This software is Copyright (c) 2009 by David M. Town <dtown@cpan.org>. +This software is Copyright (c) 2010 by David M. Town <dtown@cpan.org>. This is free software, licensed under: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Net-SNMP-v6.0.0/META.yml new/Net-SNMP-v6.0.1/META.yml --- old/Net-SNMP-v6.0.0/META.yml 2009-09-09 17:13:02.000000000 +0200 +++ new/Net-SNMP-v6.0.1/META.yml 2010-09-10 02:02:45.000000000 +0200 @@ -1,48 +1,33 @@ --- -name: Net-SNMP -version: v6.0.0 +abstract: 'Object oriented interface to SNMP' author: - 'David M. Town <dtown@cpan.org>' -abstract: Object oriented interface to SNMP -license: perl -resources: - CPANForum: http://www.cpanforum.com/dist/Net-SNMP - bugtracker: http://rt.cpan.org/Public/Dist/Display.html?Name=Net-SNMP - license: http://dev.perl.org/licenses/ build_requires: Test: 0 -requires: - Carp: 0 - Errno: 0 - Exporter: 0 - IO::Socket: 0 - Math::BigInt: 0 - perl: 5.006 -recommends: - Crypt::DES: 2.03 - Crypt::Rijndael: 1.02 - Digest::HMAC: 1.00 - Digest::MD5: 2.11 - Digest::SHA1: 1.02 - Socket6: 0.23 configure_requires: - Module::Build: 0.35 + Module::Build: 0.36 +generated_by: 'Module::Build version 0.3607' +license: perl +meta-spec: + url: http://module-build.sourceforge.net/META-spec-v1.4.html + version: 1.4 +name: Net-SNMP provides: Net::SNMP: file: lib/Net/SNMP.pm - version: v6.0.0 + version: v6.0.1 Net::SNMP::Dispatcher: file: lib/Net/SNMP/Dispatcher.pm - version: v4.0.0 + version: v4.0.1 Net::SNMP::Message: file: lib/Net/SNMP/Message.pm - version: v3.0.0 + version: v3.0.1 Net::SNMP::MessageProcessing: file: lib/Net/SNMP/MessageProcessing.pm - version: v3.0.0 + version: v3.0.1 Net::SNMP::PDU: file: lib/Net/SNMP/PDU.pm - version: v3.0.0 + version: v3.0.1 Net::SNMP::Security: file: lib/Net/SNMP/Security.pm version: v2.0.0 @@ -51,7 +36,7 @@ version: v2.0.0 Net::SNMP::Security::USM: file: lib/Net/SNMP/Security/USM.pm - version: v4.0.0 + version: v4.0.1 Net::SNMP::Transport: file: lib/Net/SNMP/Transport.pm version: v3.0.0 @@ -73,7 +58,22 @@ Net::SNMP::Transport::IPv6::UDP: file: lib/Net/SNMP/Transport/IPv6/UDP.pm version: v3.0.0 -generated_by: Module::Build version 0.35 -meta-spec: - url: http://module-build.sourceforge.net/META-spec-v1.4.html - version: 1.4 +recommends: + Crypt::DES: 2.03 + Crypt::Rijndael: 1.02 + Digest::HMAC: 1.00 + Digest::MD5: 2.11 + Digest::SHA1: 1.02 + Socket6: 0.23 +requires: + Carp: 0 + Errno: 0 + Exporter: 0 + IO::Socket: 0 + Math::BigInt: 0 + perl: 5.006 +resources: + CPANForum: http://www.cpanforum.com/dist/Net-SNMP + bugtracker: http://rt.cpan.org/Public/Dist/Display.html?Name=Net-SNMP + license: http://dev.perl.org/licenses/ +version: v6.0.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Net-SNMP-v6.0.0/README new/Net-SNMP-v6.0.1/README --- old/Net-SNMP-v6.0.0/README 2009-09-09 17:13:02.000000000 +0200 +++ new/Net-SNMP-v6.0.1/README 2010-09-10 02:02:45.000000000 +0200 @@ -1,5 +1,5 @@ - Net::SNMP, version 6.0.0 + Net::SNMP, version 6.0.1 NAME @@ -73,7 +73,7 @@ LICENSE AND COPYRIGHT - Copyright (c) 1998-2009 David M. Town. All rights reserved. + Copyright (c) 1998-2010 David M. Town. All rights reserved. This program is free software; you may redistribute it and/or modify it under the same terms as the Perl 5 programming language @@ -81,5 +81,5 @@ RCS - $Id: README,v 6.0 2009/09/09 15:07:48 dtown Rel $ + $Id: README,v 6.1 2010/09/10 00:01:22 dtown Rel $ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Net-SNMP-v6.0.0/lib/Net/SNMP/Dispatcher.pm new/Net-SNMP-v6.0.1/lib/Net/SNMP/Dispatcher.pm --- old/Net-SNMP-v6.0.0/lib/Net/SNMP/Dispatcher.pm 2009-09-09 17:13:02.000000000 +0200 +++ new/Net-SNMP-v6.0.1/lib/Net/SNMP/Dispatcher.pm 2010-09-10 02:02:45.000000000 +0200 @@ -3,11 +3,11 @@ package Net::SNMP::Dispatcher; -# $Id: Dispatcher.pm,v 4.0 2009/09/09 15:05:33 dtown Rel $ +# $Id: Dispatcher.pm,v 4.1 2010/09/10 00:01:22 dtown Rel $ # Object that dispatches SNMP messages and handles the scheduling of events. -# Copyright (c) 2001-2009 David M. Town <dtown@cpan.org> +# Copyright (c) 2001-2010 David M. Town <dtown@cpan.org> # All rights reserved. # This program is free software; you may redistribute it and/or modify it @@ -23,7 +23,7 @@ ## Version of the Net::SNMP::Dispatcher module -our $VERSION = v4.0.0; +our $VERSION = v4.0.1; ## Package variables @@ -49,7 +49,8 @@ if (eval 'require Time::HiRes') { Time::HiRes->import('time'); no warnings; - if (eval 'Time::HiRes::clock_gettime(Time::HiRes::CLOCK_MONOTONIC())') { + if (eval 'Time::HiRes::clock_gettime(Time::HiRes::CLOCK_MONOTONIC())' > 0) + { *time = sub () { Time::HiRes::clock_gettime(Time::HiRes::CLOCK_MONOTONIC()); }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Net-SNMP-v6.0.0/lib/Net/SNMP/Message.pm new/Net-SNMP-v6.0.1/lib/Net/SNMP/Message.pm --- old/Net-SNMP-v6.0.0/lib/Net/SNMP/Message.pm 2009-09-09 17:13:02.000000000 +0200 +++ new/Net-SNMP-v6.0.1/lib/Net/SNMP/Message.pm 2010-09-10 02:02:45.000000000 +0200 @@ -4,11 +4,11 @@ package Net::SNMP::Message; -# $Id: Message.pm,v 3.0 2009/09/09 15:05:33 dtown Rel $ +# $Id: Message.pm,v 3.1 2010/09/10 00:01:22 dtown Rel $ # Object used to represent a SNMP message. -# Copyright (c) 2001-2009 David M. Town <dtown@cpan.org> +# Copyright (c) 2001-2010 David M. Town <dtown@cpan.org> # All rights reserved. # This program is free software; you may redistribute it and/or modify it @@ -23,7 +23,7 @@ ## Version of the Net::SNMP::Message module -our $VERSION = v3.0.0; +our $VERSION = v3.0.1; ## Handle importing/exporting of symbols @@ -1046,7 +1046,15 @@ return $this->_error('The OBJECT IDENTIFIER value not defined'); } - # Input is expected in dotted notation, so break it up into subids. + # The OBJECT IDENTIFIER is expected in dotted notation. + if ($value !~ m/^\.?\d+(?:\.\d+)* *$/) { + return $this->_error( + 'The OBJECT IDENTIFIER value "%s" is expected in dotted decimal ' . + 'notation', $value + ); + } + + # Break it up into sub-identifiers. my @subids = split /\./, $value; # If there was a leading dot on _any_ OBJECT IDENTIFIER passed to diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Net-SNMP-v6.0.0/lib/Net/SNMP/MessageProcessing.pm new/Net-SNMP-v6.0.1/lib/Net/SNMP/MessageProcessing.pm --- old/Net-SNMP-v6.0.0/lib/Net/SNMP/MessageProcessing.pm 2009-09-09 17:13:02.000000000 +0200 +++ new/Net-SNMP-v6.0.1/lib/Net/SNMP/MessageProcessing.pm 2010-09-10 02:02:45.000000000 +0200 @@ -3,11 +3,11 @@ package Net::SNMP::MessageProcessing; -# $Id: MessageProcessing.pm,v 3.0 2009/09/09 15:05:33 dtown Rel $ +# $Id: MessageProcessing.pm,v 3.1 2010/09/10 00:01:22 dtown Rel $ # Object that implements the Message Processing module. -# Copyright (c) 2001-2009 David M. Town <dtown@cpan.org> +# Copyright (c) 2001-2010 David M. Town <dtown@cpan.org> # All rights reserved. # This program is free software; you may redistribute it and/or modify it @@ -25,7 +25,7 @@ ## Version of the Net::SNMP::MessageProcessing module -our $VERSION = v3.0.0; +our $VERSION = v3.0.1; ## Package variables @@ -209,9 +209,9 @@ $request->msg_security_model(), $msg->msg_security_model() ); return FALSE; - } else { - $msg->security($request->security()); } + + $msg->security($request->security()); # Pass off to the Security Model if (!defined $request->security()->process_incoming_msg($msg)) { @@ -280,7 +280,7 @@ # Check the request-id if ($msg->request_id() != $request->request_id()) { $this->_error( - 'A request-id %d was expected, but %d was found', + 'The request-id %d was expected, but %d was found', $request->request_id(), $msg->request_id() ); return FALSE; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Net-SNMP-v6.0.0/lib/Net/SNMP/PDU.pm new/Net-SNMP-v6.0.1/lib/Net/SNMP/PDU.pm --- old/Net-SNMP-v6.0.0/lib/Net/SNMP/PDU.pm 2009-09-09 17:13:02.000000000 +0200 +++ new/Net-SNMP-v6.0.1/lib/Net/SNMP/PDU.pm 2010-09-10 02:02:45.000000000 +0200 @@ -3,11 +3,11 @@ package Net::SNMP::PDU; -# $Id: PDU.pm,v 3.0 2009/09/09 15:05:33 dtown Rel $ +# $Id: PDU.pm,v 3.1 2010/09/10 00:01:22 dtown Rel $ # Object used to represent a SNMP PDU. -# Copyright (c) 2001-2009 David M. Town <dtown@cpan.org> +# Copyright (c) 2001-2010 David M. Town <dtown@cpan.org> # All rights reserved. # This program is free software; you may redistribute it and/or modify it @@ -25,7 +25,7 @@ ## Version of the Net::SNMP::PDU module -our $VERSION = v3.0.0; +our $VERSION = v3.0.1; ## Handle importing/exporting of symbols @@ -800,12 +800,6 @@ my $pairs = []; for (@{$oids}) { - if (!m/^\.?\d+(?:\.\d+)* *$/) { - return $this->_error( - 'The OBJECT IDENTIFIER value "%s" is expected in dotted decimal ' . - 'notation', $_ - ); - } push @{$pairs}, OBJECT_IDENTIFIER, $_, NULL, q{}; } @@ -831,11 +825,6 @@ my $pairs = []; for (my $i = 0; $i < $#{$trios}; $i += 3) { - if ($trios->[$i] !~ m/^\.?\d+(?:\.\d+)* *$/) { - return $this->_error( - 'The OBJECT IDENTIFIER value "%s" is expected in dotted decimal ' . 'notation', $trios->[$i] - ); - } push @{$pairs}, OBJECT_IDENTIFIER, $trios->[$i], $trios->[$i+1], $trios->[$i+2]; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Net-SNMP-v6.0.0/lib/Net/SNMP/Security/USM.pm new/Net-SNMP-v6.0.1/lib/Net/SNMP/Security/USM.pm --- old/Net-SNMP-v6.0.0/lib/Net/SNMP/Security/USM.pm 2009-09-09 17:13:02.000000000 +0200 +++ new/Net-SNMP-v6.0.1/lib/Net/SNMP/Security/USM.pm 2010-09-10 02:02:45.000000000 +0200 @@ -3,11 +3,11 @@ package Net::SNMP::Security::USM; -# $Id: USM.pm,v 4.0 2009/09/09 15:05:33 dtown Rel $ +# $Id: USM.pm,v 4.1 2010/09/10 00:01:22 dtown Rel $ # Object that implements the SNMPv3 User-based Security Model. -# Copyright (c) 2001-2009 David M. Town <dtown@cpan.org> +# Copyright (c) 2001-2010 David M. Town <dtown@cpan.org> # All rights reserved. # This program is free software; you may redistribute it and/or modify it @@ -30,7 +30,7 @@ ## Version of the Net::SNMP::Security::USM module -our $VERSION = v4.0.0; +our $VERSION = v4.0.1; ## Handle importing/exporting of symbols @@ -398,7 +398,7 @@ } if (($msg_engine_time < 0) || ($msg_engine_time > 2147483647)) { return $this->_error( - 'The msgAuthoritativeEngineTime value is out of range ' . + 'The msgAuthoritativeEngineTime value %d is out of range ' . '(0..2147483647)', $msg_engine_time ); } @@ -654,7 +654,7 @@ if (@_ == 2) { if ($user_name eq q{}) { - return $this->_error('The an empty userName was specified'); + return $this->_error('An empty userName was specified'); } elsif (length($user_name) > 32) { return $this->_error( 'The userName length of %d is out of range (1..32)', @@ -1013,8 +1013,8 @@ return TRUE if ($this->{_authoritative}); return TRUE if ($this->{_security_level} < SECURITY_LEVEL_AUTHNOPRIV); - if (($msg_boots > $this->_engine_boots) || - (($msg_boots == $this->_engine_boots) && + if (($msg_boots > $this->_engine_boots()) || + (($msg_boots == $this->_engine_boots()) && ($msg_time > $this->{_latest_engine_time}))) { DEBUG_INFO( @@ -1038,7 +1038,7 @@ DEBUG_INFO( 'no update: engineBoots = %d, msgBoots = %d; ' . 'latestTime = %d, msgTime = %d', - $this->_engine_boots, $msg_boots, + $this->_engine_boots(), $msg_boots, $this->{_latest_engine_time}, $msg_time ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Net-SNMP-v6.0.0/lib/Net/SNMP.pm new/Net-SNMP-v6.0.1/lib/Net/SNMP.pm --- old/Net-SNMP-v6.0.0/lib/Net/SNMP.pm 2009-09-09 17:13:02.000000000 +0200 +++ new/Net-SNMP-v6.0.1/lib/Net/SNMP.pm 2010-09-10 02:02:45.000000000 +0200 @@ -3,9 +3,9 @@ package Net::SNMP; -# $Id: SNMP.pm,v 6.0 2009/09/09 15:05:33 dtown Rel $ +# $Id: SNMP.pm,v 6.1 2010/09/10 00:01:22 dtown Rel $ -# Copyright (c) 1998-2009 David M. Town <dtown@cpan.org> +# Copyright (c) 1998-2010 David M. Town <dtown@cpan.org> # All rights reserved. # This program is free software; you may redistribute it and/or modify it @@ -106,7 +106,7 @@ ## Version of the Net::SNMP module -our $VERSION = 'v6.0.0'; +our $VERSION = 'v6.0.1'; $VERSION = eval $VERSION; ## Load our modules @@ -126,7 +126,7 @@ NOSUCHINSTANCE ENDOFMIBVIEW snmp_dispatcher ); -our @EXPORT_OK = qw( snmp_event_loop oid_context_match ); +our @EXPORT_OK = qw( oid_context_match ); our %EXPORT_TAGS = ( asn1 => [ @@ -597,7 +597,7 @@ =cut -sub close : locked : method +sub close { my ($this) = @_; @@ -661,7 +661,7 @@ =cut -sub get_request : locked : method +sub get_request { my $this = shift; @@ -714,7 +714,7 @@ =cut -sub get_next_request : locked : method +sub get_next_request { my $this = shift; @@ -770,7 +770,7 @@ =cut -sub set_request : locked : method +sub set_request { my $this = shift; @@ -875,7 +875,7 @@ =cut -sub trap : locked : method +sub trap { my $this = shift; @@ -958,7 +958,7 @@ =cut -sub get_bulk_request : locked : method +sub get_bulk_request { my $this = shift; @@ -1034,7 +1034,7 @@ =cut -sub inform_request : locked : method +sub inform_request { my $this = shift; @@ -1109,7 +1109,7 @@ =cut -sub snmpv2_trap : locked : method +sub snmpv2_trap { my $this = shift; @@ -1174,7 +1174,7 @@ =cut -sub get_table : locked : method +sub get_table { my $this = shift; @@ -1327,7 +1327,7 @@ =cut -sub get_entries : locked : method +sub get_entries { my $this = shift; @@ -1366,11 +1366,11 @@ if (defined $argv[0]) { - # XXX: Argument deprecated after v5.2.0. + # XXX: Argument deprecated after v5.2.0, obsolete in 6.0.1. require Carp; - Carp::carp( - 'The entryoid argument is deprecated, use the columns argument ' . + Carp::croak( + 'The entryoid argument is obsolete, use the columns argument ' . 'with a list of column OBJECT IDENTIFIERs' ); @@ -1559,7 +1559,7 @@ =cut -sub version : locked : method +sub version { my ($this) = @_; @@ -1577,7 +1577,7 @@ =cut -sub error : locked : method +sub error { return $_[0]->{_error} || q{}; } @@ -1586,12 +1586,14 @@ $hostname = $session->hostname(); -This method returns the hostname string that is associated with the object -as it was passed to the C<session()> constructor. +This method returns the parsed hostname string that is associated with the +object. Any port information and formatting that can be included with the +corresponding C<session()> constructor argument will be stripped and not +included as part of the returned string. =cut -sub hostname : locked : method +sub hostname { return $_[0]->{_hostname}; } @@ -1605,7 +1607,7 @@ =cut -sub error_status : locked : method +sub error_status { return defined($_[0]->{_pdu}) ? $_[0]->{_pdu}->error_status() : 0; } @@ -1619,7 +1621,7 @@ =cut -sub error_index : locked : method +sub error_index { return defined($_[0]->{_pdu}) ? $_[0]->{_pdu}->error_index() : 0; } @@ -1641,7 +1643,7 @@ =cut -sub var_bind_list : locked : method +sub var_bind_list { return defined($_[0]->{_pdu}) ? $_[0]->{_pdu}->var_bind_list() : undef; } @@ -1661,7 +1663,7 @@ =cut -sub var_bind_names : locked : method +sub var_bind_names { return defined($_[0]->{_pdu}) ? @{$_[0]->{_pdu}->var_bind_names()} : (); } @@ -1681,7 +1683,7 @@ =cut -sub var_bind_types : locked : method +sub var_bind_types { return defined($_[0]->{_pdu}) ? $_[0]->{_pdu}->var_bind_types() : undef; } @@ -1702,7 +1704,7 @@ =cut -sub timeout : locked : method +sub timeout { my $this = shift; @@ -1732,7 +1734,7 @@ =cut -sub retries : locked : method +sub retries { my $this = shift; @@ -1769,7 +1771,7 @@ =cut -sub max_msg_size : locked : method +sub max_msg_size { my $this = shift; @@ -1876,7 +1878,7 @@ =cut -sub translate : locked : method +sub translate { my ($this, $mask) = @_; @@ -2001,22 +2003,22 @@ return debug(undef, $_[0]); } -sub pdu : locked : method +sub pdu { return $_[0]->{_pdu}; } -sub nonblocking : locked : method +sub nonblocking { return $_[0]->{_nonblocking}; } -sub security : locked : method +sub security { return $_[0]->{_security}; } -sub transport : locked : method +sub transport { return $_[0]->{_transport}; } @@ -2055,8 +2057,8 @@ sub oid_context_match { require Carp; - Carp::carp( - 'oid_context_match() is deprecated, use oid_base_match() instead' + Carp::croak( + 'oid_context_match() is obsolete, use oid_base_match() instead' ); goto &oid_base_match; @@ -3018,6 +3020,19 @@ # Override the callback with the saved callback. $this->{_pdu}->callback($callback); + # Use the contextEngineID and contextName from the previous request + # because the values stored in the object could change. + + if (defined $pdu->context_engine_id()) { + $this->{_pdu}->context_engine_id($pdu->context_engine_id()); + } + + if (defined $pdu->context_name()) { + $this->{_pdu}->context_name($pdu->context_name()); + } + + # Create the appropriate request. + if ($argv->{use_bulk}) { if (!defined $this->{_pdu}->prepare_get_bulk_request(0, $argv->{max_reps}, @@ -3566,7 +3581,7 @@ =head1 LICENSE AND COPYRIGHT -Copyright (c) 1998-2009 David M. Town. All rights reserved. +Copyright (c) 1998-2010 David M. Town. All rights reserved. This program is free software; you may redistribute it and/or modify it under the same terms as the Perl 5 programming language system itself. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Net-SNMP-v6.0.0/t/dsp.t new/Net-SNMP-v6.0.1/t/dsp.t --- old/Net-SNMP-v6.0.0/t/dsp.t 2009-09-09 17:13:02.000000000 +0200 +++ new/Net-SNMP-v6.0.1/t/dsp.t 2010-09-10 02:02:45.000000000 +0200 @@ -1,7 +1,7 @@ # -*- mode: perl -*- # ============================================================================ -# $Id: dsp.t,v 6.0 2009/09/09 15:07:48 dtown Rel $ +# $Id: dsp.t,v 6.1 2010/09/10 00:01:22 dtown Rel $ # Test of the Net::SNMP Dispatcher and Transport Domain objects. @@ -129,14 +129,14 @@ my $d = time - $s; - return (($d >= $c - 1) && ($d <= $c + 1)); + return (($d >= $c - 1) && ($d <= $c + 1)) ? $c : $d; } sub timer_test { my ($d, $c, $s) = @_; - ok(timer_check($c, $s), 1, "timer_test(): Timer test $c failed"); + ok(timer_check($c, $s), $c, "timer_test(): Timer test $c failed"); return; } @@ -149,7 +149,7 @@ { my ($d, $c, $s, $t) = @_; - ok(timer_check($c, $s), 1, "trans_send(): Timer test $c failed"); + ok(timer_check($c, $s), $c, "trans_send(): Timer test $c failed"); $c = $t->send(' '); @@ -185,7 +185,7 @@ { my ($d, $c, $s, $t) = @_; - ok(timer_check($c, $s), 1, "trans_dereg(): Timer test $c failed"); + ok(timer_check($c, $s), $c, "trans_dereg(): Timer test $c failed"); $c = $d->deregister($t); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org