Hello community, here is the log from the commit of package perl-JSON-PP for openSUSE:Factory checked in at 2011-12-21 10:02:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-JSON-PP (Old) and /work/SRC/openSUSE:Factory/.perl-JSON-PP.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-JSON-PP", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/perl-JSON-PP/perl-JSON-PP.changes 2011-09-23 12:37:45.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.perl-JSON-PP.new/perl-JSON-PP.changes 2011-12-21 10:02:11.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Nov 29 15:13:53 UTC 2011 - coolo@suse.com + +- update to 2.27200 + fixed incr_parse docodeing string more correctly (RT#68032 by LCONS) + +------------------------------------------------------------------- Old: ---- JSON-PP-2.27105.tar.gz New: ---- JSON-PP-2.27200.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-JSON-PP.spec ++++++ --- /var/tmp/diff_new_pack.NqHYYh/_old 2011-12-21 10:02:12.000000000 +0100 +++ /var/tmp/diff_new_pack.NqHYYh/_new 2011-12-21 10:02:12.000000000 +0100 @@ -16,17 +16,15 @@ # - Name: perl-JSON-PP -Version: 2.27105 -Release: 1 -License: GPL+ or Artistic +Version: 2.27200 +Release: 0 %define cpan_name JSON-PP Summary: JSON::XS compatible pure-Perl module. -Url: http://search.cpan.org/dist/JSON-PP/ +License: GPL-1.0+ or Artistic-1.0 Group: Development/Libraries/Perl -#Source: http://www.cpan.org/authors/id/M/MA/MAKAMAKA/JSON-PP-%{version}.tar.gz -Source: %{cpan_name}-%{version}.tar.gz +Url: http://search.cpan.org/dist/JSON-PP/ +Source: http://www.cpan.org/authors/id/M/MA/MAKAMAKA/JSON-PP-%{version}.tar.gz BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: perl ++++++ JSON-PP-2.27105.tar.gz -> JSON-PP-2.27200.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/JSON-PP-2.27105/Changes new/JSON-PP-2.27200/Changes --- old/JSON-PP-2.27105/Changes 2011-03-08 04:43:08.000000000 +0100 +++ new/JSON-PP-2.27200/Changes 2011-05-22 05:20:34.000000000 +0200 @@ -20,10 +20,15 @@ * release JSON distribution as stable version. - * rename JSON::PPdev into JSON::PP and release on CPAN. <<<< HERE + * rename JSON::PPdev into JSON::PP and release on CPAN. + + * Perl 5.14.0 released. This module is a dual-life module. <<<< HERE -------------------------------------------------------------------------- +2.27200 Sun May 22 12:17:51 2011 + - fixed incr_parse docodeing string more correctly (rt#68032 by LCONS) + 2.27105 Tue Mar 8 12:38:42 2011 - removed t/900_pod.t from package because of author test diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/JSON-PP-2.27105/MANIFEST new/JSON-PP-2.27200/MANIFEST --- old/JSON-PP-2.27105/MANIFEST 2011-03-08 04:38:03.000000000 +0100 +++ new/JSON-PP-2.27200/MANIFEST 2011-05-22 05:46:42.000000000 +0200 @@ -39,4 +39,5 @@ t/113_overloaded_eq.t t/114_decode_prefix.t t/115_tie_ixhash.t +t/116_incr_parse_fixed.t t/_unicode_handling.pm diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/JSON-PP-2.27105/META.yml new/JSON-PP-2.27200/META.yml --- old/JSON-PP-2.27105/META.yml 2011-03-08 04:55:39.000000000 +0100 +++ new/JSON-PP-2.27200/META.yml 2011-05-22 05:47:11.000000000 +0200 @@ -1,6 +1,6 @@ --- #YAML:1.0 name: JSON-PP -version: 2.27105 +version: 2.27200 abstract: JSON::XS compatible pure-Perl module. author: - Makamaka Hannyaharamitu, E<lt>makamaka[at]cpan.orgE<gt> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/JSON-PP-2.27105/README new/JSON-PP-2.27200/README --- old/JSON-PP-2.27105/README 2010-12-29 07:37:36.000000000 +0100 +++ new/JSON-PP-2.27200/README 2011-05-22 05:22:59.000000000 +0200 @@ -24,6 +24,8 @@ * rename JSON::PPdev into JSON::PP and release on CPAN. + * Perl 5.14.0 released. This module is a dual-life module. <<<< HERE + ================= INSTALLATION diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/JSON-PP-2.27105/lib/JSON/PP.pm new/JSON-PP-2.27200/lib/JSON/PP.pm --- old/JSON-PP-2.27105/lib/JSON/PP.pm 2011-03-08 04:54:03.000000000 +0100 +++ new/JSON-PP-2.27200/lib/JSON/PP.pm 2011-05-22 05:41:57.000000000 +0200 @@ -11,7 +11,7 @@ use B (); #use Devel::Peek; -$JSON::PP::VERSION = '2.27105'; +$JSON::PP::VERSION = '2.27200'; @JSON::PP::EXPORT = qw(encode_json decode_json from_json to_json); @@ -1459,7 +1459,7 @@ if ( defined wantarray ) { - $self->{incr_mode} = INCR_M_WS; + $self->{incr_mode} = INCR_M_WS unless defined $self->{incr_mode}; if ( wantarray ) { my @ret; @@ -1470,10 +1470,10 @@ push @ret, $self->_incr_parse( $coder, $self->{incr_text} ); unless ( !$self->{incr_nest} and $self->{incr_mode} == INCR_M_JSON ) { - $self->{incr_mode} = INCR_M_WS; + $self->{incr_mode} = INCR_M_WS if $self->{incr_mode} != INCR_M_STR; } - } until ( !$self->{incr_text} ); + } until ( length $self->{incr_text} >= $self->{incr_p} ); $self->{incr_parsing} = 0; @@ -1512,6 +1512,10 @@ my $s = substr( $text, $p++, 1 ); if ( $s eq '"' ) { + if (substr( $text, $p - 2, 1 ) eq '\\' ) { + next; + } + if ( $self->{incr_mode} != INCR_M_STR ) { $self->{incr_mode} = INCR_M_STR; } @@ -1545,6 +1549,7 @@ $self->{incr_p} = $p; + return if ( $self->{incr_mode} == INCR_M_STR and not $self->{incr_nest} ); return if ( $self->{incr_mode} == INCR_M_JSON and $self->{incr_nest} > 0 ); return '' unless ( length substr( $self->{incr_text}, 0, $p ) ); @@ -1625,9 +1630,9 @@ =head1 VERSION - 2.27105 + 2.27200 -LJSON::XS 2.27 compatible. +LJSON::XS 2.27 (~2.30) compatible. =head1 NOTE @@ -1826,7 +1831,7 @@ =head2 new - $json = new JSON::PP + $json = JSON::PP->new Rturns a new JSON::PP object that can be used to de/encode JSON strings. @@ -2804,7 +2809,7 @@ =head1 COPYRIGHT AND LICENSE -Copyright 2007-2010 by Makamaka Hannyaharamitu +Copyright 2007-2011 by Makamaka Hannyaharamitu This library is free software; you can redistribute it and/or modify it under the same terms as Perl itself. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/JSON-PP-2.27105/t/116_incr_parse_fixed.t new/JSON-PP-2.27200/t/116_incr_parse_fixed.t --- old/JSON-PP-2.27105/t/116_incr_parse_fixed.t 1970-01-01 01:00:00.000000000 +0100 +++ new/JSON-PP-2.27200/t/116_incr_parse_fixed.t 2011-05-22 05:26:15.000000000 +0200 @@ -0,0 +1,25 @@ +#!/usr/bin/perl + +use strict; +use Test::More tests => 4; + +use JSON::PP; + +my $json = JSON::PP->new->allow_nonref(); + +my @vs = $json->incr_parse('"a\"bc'); + +ok( not scalar(@vs) ); + +@vs = $json->incr_parse('"'); + +is( $vs[0], "a\"bc" ); + + +$json = JSON::PP->new; + +@vs = $json->incr_parse('"a\"bc'); +ok( not scalar(@vs) ); +@vs = eval { $json->incr_parse('"') }; +ok($@ =~ qr/JSON text must be an object or array/); + -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org